Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 6 Aug 2010 03:40:47 +0000 (03:40 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 6 Aug 2010 03:40:47 +0000 (03:40 +0000)
commitccebd04ab8964f7068accfba5200ad04d8dc9365
tree5dbce7630126cfbc53947bafb0fb6d1ff47dd779
parent74f46b472a3c831de6b86fa726d242eedf1f3e08
parent29de0856aceadab4208072f460221a28a41727c4
Merge from mainline.